bitkeeper revision 1.769 (40490fd2Q8m3cqtseHd74X5ZQEP1vA)

8139too.c, setup.c, Xeno-HOWTO.txt, Makefile:
  Cleanups.

diff --git a/Makefile b/Makefile
index c1798e196360bb8c8d1cf24ab4f6c6afbfc53c14..2c9031ef0fe7e00588c0f9c1e9419410ce2d3161 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,10 @@
 # Builds everything except Xenolinux:
 #  cd xenolinux-<version>-sparse
 #  ./mkbuildtree <build dir>
-#  cd <build dir> && ARCH=xeno make oldconfig dep bzImage
+#  cd <build dir>
+#  ARCH=xeno make oldconfig
+#  ARCH=xeno make dep
+#  ARCH=xeno make bzImage
 #  (<build dir> should be a vanilla linux tree with matching version)
 
 all:   

diff --git a/docs/Xeno-HOWTO.txt b/docs/Xeno-HOWTO.txt
index 9a74bbd7495421be48ea61ba187103272c0018d1..167615d758e36365508e3fcfc8f43065aa4da41b 100644 (file)
--- a/docs/Xeno-HOWTO.txt
+++ b/docs/Xeno-HOWTO.txt
@@ -96,7 +96,8 @@ if you want.
 
   # cd /xeno-1.2.bk/xenolinux-2.4.24
   # ARCH=xeno make oldconfig   { or menuconfig, or xconfig, or config }  
-  # ARCH=xeno make dep bzImage
+  # ARCH=xeno make dep
+  # ARCH=xeno make bzImage
 
 Assuming the build works, you'll end up with
 /xeno-1.2.bk/xenolinux-2.4.24/arch/xeno/boot/xenolinux.gz. This is the

diff --git a/xen/arch/i386/setup.c b/xen/arch/i386/setup.c
index ef3626ccf5e022889c0681bc3fd0ad78c96eaa08..95b02926256107245eb6313be4e14c8489fa7b36 100644 (file)
--- a/xen/arch/i386/setup.c
+++ b/xen/arch/i386/setup.c
@@ -323,9 +323,11 @@ void __init start_of_day(void)
     extern int do_timer_lists_from_pit;
     unsigned long low_mem_size;
     
+#ifdef MEMORY_GUARD
     /* Unmap the first page of CPU0's stack. */
     extern unsigned long cpu0_stack[];
     memguard_guard_range(cpu0_stack, PAGE_SIZE);
+#endif
 
     if ( opt_watchdog ) 
         nmi_watchdog = NMI_LOCAL_APIC;

diff --git a/xen/drivers/net/8139too.c b/xen/drivers/net/8139too.c
index 0cdb6683cc8e93a551311ee85094bea452dfec80..6b4606062b67a11269ed571e8dad9a5ce62e6ab2 100644 (file)
--- a/xen/drivers/net/8139too.c
+++ b/xen/drivers/net/8139too.c
@@ -138,11 +138,7 @@ typedef int pid_t;
 /* define to 1 to disable lightweight runtime debugging checks */
 #undef RTL8139_NDEBUG
 
-#ifdef XEN
-#define RTL8139_DEBUG 1
-#define RTL8139_NDEBUG 1
 #undef DPRINTK
-#endif
 
 #ifdef RTL8139_DEBUG
 /* note: prints function name for you */
@@ -2701,7 +2697,7 @@ static int __init rtl8139_init_module (void)
        /* when we're a module, we always print a version message,
         * even if no 8139 board is found.
         */
-#if defined(MODULE) || defined(XEN)
+#if defined(MODULE)
        printk (KERN_INFO RTL8139_DRIVER_NAME "\n");
 #endif